diff --git a/src/db845c/mesa_prebuilt/README_UpdateMesaPrebuilts b/src/db845c/mesa_prebuilt/README_UpdateMesaPrebuilts
index 44e58bb..4077409 100644
--- a/src/db845c/mesa_prebuilt/README_UpdateMesaPrebuilts
+++ b/src/db845c/mesa_prebuilt/README_UpdateMesaPrebuilts
@@ -8,13 +8,13 @@
 
     $ mkdir $AOSP
     $ cd $AOSP
-    $ repo init -u https://android.googlesource.com/platform/manifest -b master
+    $ repo init -u https://android.googlesource.com/platform/manifest -b master --repo-rev=stable
     $ repo sync -j`nproc`
     $ cd $AOSP/external/mesa3d
     $ git checkout aosp/upstream-main
     $ cd $AOSP
     $ . build/envsetup.sh
-    $ lunch db845c-userdebug
+    $ lunch db845c-trunk_staging-userdebug
     $ make TARGET_BUILD_MESA=true -j`nproc`
 
 * Boot the DB845c/RB5 in fastboot mode and flash the images:
@@ -28,7 +28,7 @@
 ------------------------------------------------------------
 * Before we update and ship the new set of Mesa prebuilt binaries, please make
   sure that there are no new or obvious regressions when we test run
-  CtsGraphicsTestcases, CtsDEQPTestcases and CtsHardwareTestcases on DB845c and
+  CtsGraphicsTestcases, CtsDisplayTestCases and CtsSystemUiTestCases on DB845c and
   RB5 with the new binaries.
 
   Report any breakages or regressions at https://gitlab.freedesktop.org/mesa/mesa/-/issues
@@ -55,28 +55,13 @@
 
 Troubleshooting:
 ----------------
-* Upstream Mesa is/was broken due to deprecated libbacktrace in AOSP
-  https://gitlab.freedesktop.org/mesa/mesa/-/issues/7465,
-  so we may have to use following hack to workaround that build error:
+* Upstream has a new dependency on meson version >= 0.54 and Python (3.x)
+  mako module >= 0.8.0 now, and that broke the build on Ubuntu 20.04.5.
+  So install python3-mako and update meson:
 
-    -- a/src/util/meson.build
-    +++ b/src/util/meson.build
-    @@ -269,7 +269,7 @@ libmesa_util_sse41 = static_library(
-
-     _libmesa_util = static_library(
-       'mesa_util',
-    -  [files_mesa_util, files_debug_stack, format_srgb, u_indices_gen_c, u_unfilled_gen_c],
-    +  [files_mesa_util, format_srgb, u_indices_gen_c, u_unfilled_gen_c],
-       include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux],
-       dependencies : deps_for_libmesa_util,
-       link_with: [libmesa_format, libmesa_util_sse41],
-
-* Upstream also has a new dependency on meson version >= 0.54 now,
-  and that broke the build on Ubuntu 20.04.5. So update meson by
-  adding the following untrusted PPA:
+    $ sudo apt install python3-mako
 
     $ sudo add-apt-repository ppa:ubuntu-support-team/meson
     $ sudo apt update
     $ sudo apt install meson
-
   h/t: https://launchpad.net/~ubuntu-support-team/+archive/ubuntu/meson